Auto merge of #1196 - alexcrichton:issue-1187, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 20 Jan 2015 00:38:16 +0000 (00:38 +0000)
committerbors <bors@rust-lang.org>
Tue, 20 Jan 2015 00:38:16 +0000 (00:38 +0000)
Closes #1187


Trivial merge